Merge with ppc/xen-unstable.hg.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 1 Aug 2007 07:59:03 +0000 (08:59 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 1 Aug 2007 07:59:03 +0000 (08:59 +0100)

Trivial merge